Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bartender Expansion #806

Closed
wants to merge 8 commits into from
Closed

Conversation

musicmanvr
Copy link
Contributor

About the PR

This PR introduces a ton of new drinks, some items for the booze-o-mat, and a lot of new flavors.

Bartender has felt pretty samey for a while, and I think adding some of the more basic (and un-basic) drinks will really help bartender to have a lot of new fun things to make.

In addition, this draft is open for the community to pitch in, offer new ideas, and really stretch their creative muscle!

Why / Balance

4 new Booze-O-Mat drinks

40+ All new drinks!

New craftable item: Pruno Mix

Chanterelle clusters now have 5 "Mushroom Powder" in addition to the nutriment for making tea.

The moldy bread loaf has returned.

Technical details

All of this code will be YAML changes, which should make it very easy to fix.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase
    (DRAFT, WILL ADD LATER)

Breaking changes

Changelog

🆑

  • add: Over 40 new drinks, 4 new items in the Booze-O-Mat, and tons of new treats for bartender!

@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an rsi label Feb 12, 2024
Copy link
Contributor

github-actions bot commented Feb 12, 2024

RSI Diff Bot; head commit f207765 merging into 09b79b3
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Consumable/Drinks/admiralty.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/amnesia.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/arnoldpalmer.rsi

State Old New Status
Untitled Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/bilk.rsi

State Old New Status
Untitled Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/birdup.rsi

State Old New Status
bird_up Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/cosmopolitan.rsi

State Old New Status
cosmopolitan Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/creamofcoconut.rsi

State Old New Status
sunup_cream_of_the_coconut Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/dirtybongwater.rsi

State Old New Status
bongwater Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/fernet.rsi

State Old New Status
fernet Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/fernetcola.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/fourteengold.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/komodo.rsi

State Old New Status
komodo_dragon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/leafygreen.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/longhaul.rsi

State Old New Status
longhaul Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/luminosity.rsi

State Old New Status
Untitled Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/mushroomtea.rsi

State Old New Status
mushroom_tea Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/navyrum.rsi

State Old New Status
navy_rum Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/painkiller.rsi

State Old New Status
painkiller Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/pinacolada.rsi

State Old New Status
Untitled Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/pruno.rsi

State Old New Status
Untitled Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/psitronic.rsi

State Old New Status
psi_tronic Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/root_canal.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/sol_dry.rsi

State Old New Status
icon Added
icon_open Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/toxicshock.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/tropical_storm.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/v8.rsi

State Old New Status
v8 Added

Edit: diff updated after f207765

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Feb 14, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Apr 14, 2024
@Colin-Tel
Copy link
Contributor

closing after over 5 months of inactivity

@Colin-Tel Colin-Tel closed this Jul 22, 2024
@musicmanvr musicmanvr deleted the Delta-Drinks branch July 23, 2024 01:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Merge Conflict Fix your PR!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants